(COMPILE_FIRST): Add cc-mode.el

and cc-vars.el.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 966ac9b8cf562d47e8f2644f0a83722604ce23de..3fb63dcc52398e079122a9f500fa79dba2d3ecfa 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -94,13 +94,18 @@ DONTCOMPILE = \
        $(lisp)/term/xterm.el \
        $(lisp)/version.el
 
-# Files to compile before others during a bootstrap.  This is done
-# to speed up the bootstrap process.
+# Files to compile before others during a bootstrap.  This is done to
+# speed up the bootstrap process.  The CC files are compiled first
+# because CC mode tweaks the compilation process, and requiring
+# cc-mode when it is not compiled doesn't work during the
+# bootstrapping.
 
 COMPILE_FIRST = \
        $(lisp)/emacs-lisp/byte-opt.el \
        $(lisp)/emacs-lisp/bytecomp.el \
-       $(lisp)/subr.el
+       $(lisp)/subr.el \
+       $(lisp)/progmodes/cc-mode.el \
+       $(lisp)/progmodes/cc-vars.el
 
 # The actual Emacs command run in the targets below.
 

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 4ec329427229ced0507e581dd079127690b07ac3..95a5bcab8c7f48cdc35ff5ce2eaabbc28f7c3979 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -96,13 +96,18 @@ DONTCOMPILE = \
        $(lisp)/term/xterm.el \
        $(lisp)/version.el
 
-# Files to compile before others during a bootstrap.  This is done
-# to speed up the bootstrap process.
+# Files to compile before others during a bootstrap.  This is done to
+# speed up the bootstrap process.  The CC files are compiled first
+# because CC mode tweaks the compilation process, and requiring
+# cc-mode when it is not compiled doesn't work during the
+# bootstrapping.
 
 COMPILE_FIRST = \
        $(lisp)/emacs-lisp/byte-opt.el \
        $(lisp)/emacs-lisp/bytecomp.el \
-       $(lisp)/subr.el
+       $(lisp)/subr.el \
+       $(lisp)/progmodes/cc-mode.el \
+       $(lisp)/progmodes/cc-vars.el
 
 # The actual Emacs command run in the targets below.